Translate x, y into widget coordinates instead of root coordinates. Patch

Mon Apr  4 12:14:35 2005  Søren Sandmann  <sandmann@redhat.com>

	* gtk/gtkmenu.c (gtk_menu_handle_scrolling): Translate x, y into
	widget coordinates instead of root coordinates. Patch from Jorn
	Baayen. (#172236)

diff --git a/ChangeLog b/ChangeLog
index d896307eee33239d9679d8bce33a243a5dd82daa..ae42fddf15530cf99f19b1dd80a5a50084f60887 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Apr  4 12:14:35 2005  Søren Sandmann  <sandmann@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_handle_scrolling): Translate x, y into
+       widget coordinates instead of root coordinates. Patch from Jorn
+       Baayen. (#172236)
+
 2005-04-04  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktoolbar.c: Add a tooltips property.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d896307eee33239d9679d8bce33a243a5dd82daa..ae42fddf15530cf99f19b1dd80a5a50084f60887 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Mon Apr  4 12:14:35 2005  Søren Sandmann  <sandmann@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_handle_scrolling): Translate x, y into
+       widget coordinates instead of root coordinates. Patch from Jorn
+       Baayen. (#172236)
+
 2005-04-04  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktoolbar.c: Add a tooltips property.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d896307eee33239d9679d8bce33a243a5dd82daa..ae42fddf15530cf99f19b1dd80a5a50084f60887 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Mon Apr  4 12:14:35 2005  Søren Sandmann  <sandmann@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_handle_scrolling): Translate x, y into
+       widget coordinates instead of root coordinates. Patch from Jorn
+       Baayen. (#172236)
+
 2005-04-04  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktoolbar.c: Add a tooltips property.

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 2dfa0c22af2cee1eced26c37b874bfecc6eab074..38c950ad4886f5bbc70efa124a56133318b4ad79 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -2954,9 +2954,10 @@ gtk_menu_handle_scrolling (GtkMenu *menu,
     GTK_WIDGET (menu)->style->ythickness + vertical_padding;
 
   gdk_window_get_position (menu->toplevel->window, &top_x, &top_y);
+  x -= top_x;
+  y -= top_y;
+
   gdk_window_get_position (GTK_WIDGET (menu)->window, &win_x, &win_y);
-  win_x += top_x;
-  win_y += top_y;
   
   if (menu->upper_arrow_visible && !menu->tearoff_active)
     {